Merge changes from topic "presubmit-am-956d795d85444d4998e861512da4188f" into...

Merge changes from topic "presubmit-am-956d795d85444d4998e861512da4188f" into tm-mainline-prod am: e6e87e18

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



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