[automerger skipped] DO NOT MERGE -  Mark RQ2A.210105.001 as merged. am: b26e77ad44 -s ours am: 8de9a2ba9b -s ours am: 7353f31f14 -s ours am: 6358d73e2d -s ours am: 94e617edd0 -s ours

am skip reason: Merged-In I7e35254d5e9065249336ec0d897298dd1abc005a with SHA-1 4783e7ed4f is already in history

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

Change-Id: I5db3185deaab2a701eb01f85a532d3b8a303bb6b