Merge "UCE OPTIONS APIs updated" am: fe4b99ee22 am: 5b71319435

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

Change-Id: Ie6cbe3fd6be6a24790f0564260749ff9c8cdd172