tree a0d2fba68a4bc59dcf6e934f342154f4501aa228
parent 1f014a4a51d744049d750b5536d8742882acadb3
parent 327c509933f37d95e408141203008914551408af
author Treehugger Robot <treehugger-gerrit@google.com> 1646179907 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1646179907 +0000

[automerger skipped] Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae am: 327c509933 -s ours

am skip reason: Merged-In Id4c8b41b23adfe931b9953113f7175a11703dc10 with SHA-1 81a4684119 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2004910

Change-Id: I72780386c0b09c1dc5a892b829302d58100cab5f