[automerger skipped] Merge "Upgrade TelephonyProvider DB for ApnSetting fields" am: 38c0250978 am: 4b534719b3 am: 119deb26ab am: 7ad363bb7a -s ours

am skip reason: Merged-In Ic9081441645ad3aef5aa68b0c6a368b863f217ba with SHA-1 b49a7405e0 is already in history

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

Change-Id: I5414b6f4e0dac924eb67bdbbd0d20aed77482f9b