Merge "do not start shutdown animation from init"
am: 84d43c8df7

Change-Id: I2cc5860c125a34b356bff9b62a9027ee293da683