[automerger skipped] Merge "Restrict ApnEditor settings" into udc-dev am:...

[automerger skipped] Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a19 am: b48dfbbe -s ours am: 2e63a566 -s ours

am skip reason: Merged-In Iecdbbff7e21dfb11e3ba385858747a220cfd3e04 with SHA-1 5a17d39d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23982512



Change-Id: I5bfaee6deec3fed3367fa4d31904151e8435bcf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>