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