Merge "Merge "[CDM] Gate hidden test API behind a permission" into udc-dev am:...

Merge "Merge "[CDM] Gate hidden test API behind a permission" into udc-dev am: f60a0fe0 am: 1720e6c9 am: 91e1d8c9" into udc-qpr-dev-plus-aosp am: 136ce119

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



Change-Id: Ifd62987bfd61e7bce94fac1f7eb64837b595f650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>