Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec am: 6b10a7a317

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

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