Merge changes Ib01ed59d,I1e13aa8c am: 5775590af6 am: ccf4fd84b1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee6dce656d609b81642898099782132c4e357072