Merge "[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings...

Merge "[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad76 -s ours am: 2aa573fb -s ours am: d091c49a -s ours am: d7d57a81 -s ours am: fecc2f5b -s ours" into udc-d1-dev-plus-aosp am: e39e53f3

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



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