Merge "Upgrade TelephonyProvider DB for ApnSetting fields" am: 38c0250978

Original change: https://android-review.googlesource.com/c/platform/packages/providers/TelephonyProvider/+/1928097

Change-Id: I0e9dcd7f6c8b880c1e1714d337220a4da59bba91