[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE...

[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 4debabe3 am: ea311ea4 -s ours am: cf37a332 -s ours

am skip reason: Change-Id Ie5bbc8016e0bbb155e411f164c755f1905d49295 with SHA-1 3d652f7e is in history

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

Change-Id: Ic08a4d602523085695e14fe6cc3fb5fc3565aa6b