Merge "DPMS workaround to check the device owner type in PermissionController" into tm-dev am: 2d31bbe7ec am: 6b10a7a317 am: 6b47a88416 am: aa043c0554
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19034752 Change-Id: I20343368228b4878d3d5d4d24b2bf83e901b07d0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: