Merge "Remove FIXME that getApnSetting should be NonNull" into rvc-dev