[automerge] DO NOT MERGE 2p: 6b0e9b46ad

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

Bug: 235098883
Change-Id: Iacaf922fabf07852b3606bf78b5d242401fa7f2f
Merged-In: Ia8b9468aa2bb8e3157c227e2617ff6a52e0af119