[automerger skipped] Merge RQ2A.210305.007 am: d174bcfe -s ours am:...

[automerger skipped] Merge RQ2A.210305.007 am: d174bcfe -s ours am: cf0269cc -s ours am: 4fdb3ab7 -s ours am: 2649674f -s ours

am skip reason: Change-Id I63cde3ff5a1af9a9a9d89e35f3ed355336d50f01 with SHA-1 9930c57c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I889dbb0aceea45215c4208fb38c95f6d4cc916b7