[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 3ccf02284e am: 165b7dc961 -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: Ic163967b20ebc0d372542e0f7fed8aa777c15002