Merge "SurfaceFlinger: add display power state timer" into qt-r1-dev
am: 7f882c4b23

Change-Id: I5e0cfe910d26fbddeb9b9a9daea37fb1ded2d7d5