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

[automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: bb4f9ae4 -s ours am: 1e8746bd -s ours am: 24a5bb89 -s ours am: 5535c727 -s ours am: 3fbe992a -s ours

am skip reason: subject contains skip directive

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



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