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

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

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