Merge "UCE OPTIONS APIs updated" am: fe4b99ee22

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

Change-Id: I7042e315e506709441f0a906e6085fdbef6ddd92