[automerger skipped] Merge "Reverted the ApnSetting behavior" am: 88b33575 am: 53f21f4a am: 327c5099 -s ours am: 595d9645 -s ours am: f27a8ef7 -s ours

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

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

Change-Id: Ibf4db23def583219c6ffae1220bfaa21e095cd0c