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

Change-Id: I9513d9e37a87e34cafed539818be8a44cd87cc87