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

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

Change-Id: I368a1289fa670a885eeec0aa67760d7c6f52e083