[automerger skipped] Merge Android R am: 30299a81 -s ours am: b8065396 -s...

[automerger skipped] Merge Android R am: 30299a81 -s ours am: b8065396 -s ours am: 0fbc3c11 -s ours am: 2caf7e0a -s ours am: 4a535b03 -s ours

am skip reason: Change-Id I6a389399d923fbb7853d99358d60a20dd85837d4 with SHA-1 c741709d is in history

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

Change-Id: I3aed4603fef9f5cfa54199356a0e1b18e71cb2b8