Merge "Merge "DPMS workaround to check the device owner type in...

Merge "Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7 am: d1208844" into tm-d1-dev-plus-aosp am: ae479f66 am: dffaf67a

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



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