Merge "Move the UCE APIs to @hide for Android R"