tree 04e8c1451993b38941617ba2b4664107a2106037
parent bbdb4d9ee592b2a25b56dbefc8e5b13b9489ce8f
parent cd59a1a0f3d703455e41b1d85fecafea37bffeb2
author Brad Ebinger <breadley@google.com> 1613598287 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613598287 +0000

Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa4862f am: cd59a1a0f3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddf0a66cee2204f7eeb50ea8ce6fe38f2a93b44b