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