Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev