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

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

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