Merge changes Ib01ed59d,I1e13aa8c am: 5775590af6

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1593793

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2095dd25c26f8dece0e1fd534ae65afa811d5989