[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: aadd6bf231 am: 32aa2f2167 -s ours am: 90bf8b15e5 -s ours am: 34dc83d318 -s ours

am skip reason: Change-Id I4cd9725b3049dc96a56a723902470fd89501b9f8 with SHA-1 f4a979987e is in history

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

Change-Id: Ia8f15ebf15e09ca8148eb5ace30c97fc1cba252e