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

Change-Id: Ie828fa6ea8b54ac7832b45153247d838f0566a7e