Merge "Fix missing MANAGE_USER error on calls to isDeviceSecure"