Merge "Merge "Shortened and adjustable screen timeouts" into qt-r1-dev am: 969c3d9b87" into qt-r1-dev-plus-aosp
am: 706016714b

Change-Id: Ie2f3a219e60d8b63d16360a3ae4bc5d109125b55