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

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



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