Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev