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

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



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