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

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

Change-Id: Ica9edf67d4eb40cc5d3d067ecb6dc3f61f0e092f