Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959
am: a733ead043
am: 857d656932
am: 791d1150aa
am: 36a649dbbb
Change-Id: I63481103b808982df9073cd328239f162804adb6
This commit is contained in: