[automerger skipped] Merge "UCE OPTIONS APIs updated" am: fe4b99ee22 am: 5b71319435 am: 96972d6cf1 -s ours

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

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

Change-Id: I4eaac2ca9c94ed5b39615e603ab85b56956254e3