Merge "Revert "Require QUERY_ALL_PACKAGES getDeviceOwnerComponent""