Merge "Remove FIXME that getApnSetting should be NonNull" into rvc-dev am: 055ebf2d am: e1d1e6b7 Change-Id: I2477447c7ff9f5ebb25b7e430e46bfbc415e8827