[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: c2299492db -s ours am: 12c11a049e -s ours am: be536a4ece -s ours

am skip reason: subject contains skip directive

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

Change-Id: I433458a66088341fbe0a821889d5202fc2d76214