Merge changes from topic "am-900835d502114d3685db714f5dd1f7ed" into tm-qpr-dev-plus-aosp am: b73a160b8d

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

Change-Id: I8ece76147eeac62f060f9f016bbe9804e850c04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>