Merge "Merge "Screen off animation" into pi-dev am: 6e7e028b62" into pi-dev-plus-aosp
am: 76d54b4dea

Change-Id: I81c250aa88f1f6c36d6933010eff90ae5584b7af