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: d961d09b -s ours am: 997bbbf4 -s ours" into udc-qpr-dev-plus-aosp am: ccd46faf

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



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