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

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Restrict ApnEditor settings" into tm-qpr-dev am: a88e1b6c -s ours am: a364f647 -s ours am: 1ad564b9 -s ours

am skip reason: subject contains skip directive

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



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