Merge "AOD: avoid flicker when turning off screen" into oc-dr1-dev am: b4fe9ce703
am: a186fb8a92

Change-Id: I2d6b7033a8d20b521c9da50bfb84c0cd3b543004