Merge "Move the UCE APIs to @hide for Android R" am: c71b27c2d5 am: 7af40d3a38

Change-Id: If64d9178632d9a27e63a99c47bdfe2be5f26ad36