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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6abbcaaa9b0ae57ed49b94e439749e7be6cebc01