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

Change-Id: I2a505428fe16680e07bb6d5545c44f8ffc129c62