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

Merge "[CDM] Gate hidden test API behind a permission" into udc-dev am: f60a0fe0 am: 1720e6c9 am: 4fcf2a08

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



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