[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626 -s ours am: 2aa573fbd1 -s ours am: 80de015a39 -s ours am: 29c6c35f9c -s ours am: 513e07f285 -s ours

am skip reason: subject contains skip directive

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

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