Merge changes from topic "presubmit-am-c20e5f620bda4ba6adaa7c424096e1f1" into tm-dev am: 78002ed1 am: 54bfacbb

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



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