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