Merge changes from topic "presubmit-am-c18885cd2a3b44d1bc91572b882d121f" into tm-mainline-prod am: fbb60d6406

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

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