Merge "[Multi-user] adb fullbackup: support userId"