Merge "Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec am: d120884444" into tm-d1-dev-plus-aosp