Merge "API Coverage - Fix UCE methods not covered" am: 73789acbe8 am: c76097d9f7 am: 31c66c515b

Original change: https://android-review.googlesource.com/c/platform/cts/+/1662059

Change-Id: Iaf143caf725f6ca269e9cc42737646bdf4d2bece