Merge "Remove FIXME that getApnSetting should be NonNull"