Merge changes from topic "presubmit-am-acfb2e260ea346dbba037cc5109beb41" into sc-qpr1-dev am: 4bc6faf27b

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

Change-Id: I0c1c7d62d686e271feb9163ad200a1e66e89f286