Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043 am: b41218c2c5 am: b779272f1f am: 1ec85f8a71
Change-Id: Ie10f6226838de58759f4a410793cd9d2bfebb37f
This commit is contained in: