Merge changes from topic "presubmit-am-f5545e03e0e74c7a9e35c672e3bca66e" into tm-mainline-prod am: 7fad6f1bbe

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

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