Merge changes from topic "presubmit-am-a127b25652e84cbbbbc7fa6d6dbb96ee" into sc-qpr1-dev am: bb700059 am: 131d460f am: c71171f0

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

Change-Id: I10d7585e39082920a42cd07d90e4e35a02e0c3bf