Merge changes from topic "presubmit-am-e31a34fa6fda48f2be09bcf30fee1e73" into sc-dev-plus-aosp am: 80ea279c am: cf361531 am: be8e3bff

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

Change-Id: I8210179ab4f59d901282ddc78a07144eabb1fd77