[automerger skipped] Merge "Expose ApnSetting#TYPE_*_STRING constants" am:...

[automerger skipped] Merge "Expose ApnSetting#TYPE_*_STRING constants" am: bff83898 am: 04e788be am: e364276b -s ours

am skip reason: Change-Id I8095ebc4f766be52042eec1c8ee043bf2e2dabfb with SHA-1 d6c3f663 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib841f31fc1c0a0113db068a9cd71621b274c4cda