Merge changes from topic "tc_change_23042206_57" into tm-qpr-dev-plus-aosp am: ca89f91392 am: 590aa19a8e

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

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