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

Change-Id: I8710b4b748d415bb3c44ec8b5e14010f70468261