[automerger skipped] Merge "Update the RCS UCE APIs." am: 6c165b2da9 am: 98eb9af014 am: 77a4cfb81a -s ours

am skip reason: Change-Id I56a54cd07e8f785d7db8094b9b8a0191d6e28282 with SHA-1 142a750ab5 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d053d8e11ddb4ff36c9e13ddfc67a83a43ed58b