[automerger skipped] Merge "UCE OPTIONS APIs updated" am: fe4b99ee am: 5b713194 am: 96972d6c -s ours am: 511dd1dc -s ours

am skip reason: skip tag Change-Id Id4499d7f9f6eb2b572902d76129f9ad388354d9f with SHA-1 e2d59990 is already in history

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

Change-Id: I3c754a3cedb0d30107008e1c841010f3beea9ada