Merge "Remove unnecessary UCE APIs because some of UCE APIs change." am: 86cb5eeb1c am: 46d67749d5 am: 6e1bf17f30

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

Change-Id: I98c2b446d76b8ba97f0efcd61e40cc9ee7322665