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

am skip reason: subject contains skip directive

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

Change-Id: Icdbecd7c6588b91d3dad27e305bfb06d7554670d