[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 6c10c08756 -s ours am: 74783b88ca -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9651099b4a162bda798fb2e769813133c8fcd7ca