Merge "[automerger skipped] [RESTRICT AUTOMERGE] Restrict ApnEditor settings am: 6afcad7626
-s ours am: 2aa573fbd1
-s ours am: d091c49a5b
-s ours am: d7d57a81dd
-s ours am: fecc2f5b05
-s ours" into udc-d1-dev-plus-aosp am: e39e53f322
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>
This commit is contained in: