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: 4e46d0a8 am: 745675e8
Change-Id: I476188c7863345b6f6f59667bc3dd9bb68f7fabe