Merge "Show the default device admin dialog when clicking on a preference...

Merge "Show the default device admin dialog when clicking on a preference blocked by policy." into udc-qpr-dev am: 8712100b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/23667777



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