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

Change-Id: I6c8ff3ce9157d7535648149f47b05da143c68fe3