[automerger skipped] Merge redfin/bramble support. am: 3e327561 -s ours am:...

[automerger skipped] Merge redfin/bramble support. am: 3e327561 -s ours am: 21837ca3 -s ours am: 770ba7d9 -s ours

am skip reason: Change-Id I5fe1a724a73a0c94e4dec01336ee8574b052dd9e with SHA-1 4362cd4b is in history

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

Change-Id: I83feded79a19b841030327d9d40d63edc100576c