[automerged blank] DO NOT MERGE 2p: 6b0e9b46ad 2p: d63c409847 am: aee1cb4334 am: 12cd0840b1

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

Change-Id: I9e7c886a7ccbb5642c0fbcb6bbdd5120e4ed818e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>