[automerger skipped] Merge "Restrict ApnEditor settings" into udc-dev am: 64c88a19 am: 57b00e28 am: 8d6ff6d1 am: aefd2d6f -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: Icb17cf44f9cbaa94e2957a8e78646f7e3c58cc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>