[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: bb4f9ae4 -s ours

am skip reason: Merged-In I176d10adea620a672c2032ad3862dcf0d15c9c9b with SHA-1 9c90c46b is already in history

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



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