Merge changes from topic "presubmit-am-2b8953b4ce1d48cd8dc13c955f27c45a" into sc-qpr1-dev am: bc1a9d4c65

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

Change-Id: Ib67db17e8400a0a8735e903d097a8fe0cdd5da17