[automerger skipped] Merge RQ2A.210305.007 am: d174bcfe80 -s ours am: cf0269ccc1 -s ours am: 4fdb3ab709 -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I18e901a8efd1f20adb30d868672a871e1cc9db37