[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 skip reason: Merged-In I7e35254d5e9065249336ec0d897298dd1abc005a with SHA-1 4783e7ed is already in history

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

Change-Id: I2018788480f5b18637664c54168d20ce09a6f116