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