Merge "Flicker free screen-on from AOD" into oc-dr1-dev am: 5f62026b4e
am: 4c535d5580

Change-Id: I2c7bf05d801323121ea2f57c5ed191553b5e05bb