Merge "Expose ApnSetting#TYPE_*_STRING constants" am: bff8389872

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I80c60ba6cc1190da2d7283fcc49f6781337329d0