[automerger skipped] Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae am: 327c509933 -s ours am: 595d9645d5 -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: Ibcee1cb68199d9c987f2840846f95ba21df6f493