Merge changes from topic "presubmit-am-7c803c7e27774183999bf7d44566e148" into...

Merge changes from topic "presubmit-am-7c803c7e27774183999bf7d44566e148" into tm-qpr-dev-plus-aosp am: 2003f5c2 am: 5cc9abc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/22609236



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