Merge "Reverted the ApnSetting behavior" am: 88b3357538 am: 53f21f4aae

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

Change-Id: I442a38e34358715cee1033f1a955cc0a474f163e