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 am: 71af7ba0

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



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