[automerger skipped] Merge changes Iee19f0ff,I2d7601f4 am: 6968f3ccda am: ef8d4aed4e -s ours

am skip reason: Merged-In Ic01289a9a031d8900ad758aaa33cd4d7268dc737 with SHA-1 7e1afea5bc is already in history

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

Change-Id: I5fd6151aa1c41a66681d5831215947c6d787304a