Merge "StorageManagerService: use correct user when checking isDeviceSecure()."