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

Change-Id: If9f499f411e01d7646a05213276c71257fffd172