Merge "Change SystemUID check to QUERY_ADMIN_POLICY check"