Merge "Trigger boot animation on userspace reboot" am: 2d88794a7d am: c082f8f47c am: 4ed6bfea5e

Change-Id: I771957564b13dcb3dd9aa01f2173a6c7097df09f