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

am skip reason: Merged-In Idf604f59b3008a85428bf40009c83fb7017a06a1 with SHA-1 3394efe941 is already in history

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

Change-Id: I3731a815e2cca8afb60bce40ef45d6e5fe0bc54a