Merge "[Multi-user] Whitelist "android" for non-system user backup"