[automerger skipped] Merge "IMS RCS UCE API Improvement" am: a706df51 am:...

[automerger skipped] Merge "IMS RCS UCE API Improvement" am: a706df51 am: 321501ea am: 2eb1ac9b am: 21b5d207 -s ours

am skip reason: Merged-In I6f204b8875e0ae8cd4312cf9938ea9d673b31016 with SHA-1 aaf6c1c7 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1918644

Change-Id: I6d4cb8ec0b931085b333c39960aafd98e6d304e3