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

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

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



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