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

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



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