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

am skip reason: Merged-In I63cde3ff5a1af9a9a9d89e35f3ed355336d50f01 with SHA-1 9930c57c is already in history

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

Change-Id: I2ee6671b4a5d779a82063940ee583a1f0f8ed0e4