[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: b05bf61c61 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I323f5a10d64650292d534b2656fe408737ac107b