Merge "userspace reboot: don't re-install keyring when remounting userdata"
am: 838f5ccf9b

Change-Id: Id5af475db411f928ec074c78cea7a20ab5585767