[automerger skipped] Merge "Clear calling identity to grant CDM permission...

[automerger skipped] Merge "Clear calling identity to grant CDM permission when checking device config." into udc-dev am: a638fdce am: d265fc4c -s ours am: e25ab693 -s ours

am skip reason: Merged-In I88b399636123a4a394f2a280a19692c55a9d2441 with SHA-1 004aa708 is already in history

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



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