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

Change-Id: I1b3ffa915c42c915de332acb4b69a14f53bd6a88