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