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: 232ed933 am: 5df23d0e am: 3780f6e6
Change-Id: I1fca3ac8f2a5415c79ce793229d14ffc46036e4e