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

am skip reason: Merged-In If20a922c99e9ef4fcf303e7610f4e6f369365a62 with SHA-1 7564b7f252 is already in history

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

Change-Id: Iaac6fecd3ce8241413d04bb2a52e4bcc5b70c02e