[automerger skipped] DO NOT MERGE - Mark RQ2A.210105.001 as merged. am:...

[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: b26e77ad -s ours am: 8de9a2ba -s ours am: 7353f31f -s ours am: 6358d73e -s ours am: 9de583cd -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ia694085adb1bbc48b3b4db292aad33148f18fb89