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

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

Change-Id: I498281e9a2e9f07af869f5e6c6fa59718ca3bc1e