Merge changes Iee19f0ff,I2d7601f4 am: 6968f3ccda

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

Change-Id: Ica971a7f15a8ad2c9634e9c57b2d21566dbd5fba