Merge changes from topic "am-ec9909332fce4d5bbaa869bb48b9491b" into tm-d1-dev-plus-aosp am: b1144283b1

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

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