Merge "Migrate keychain directories to /data/misc/user/0"