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

Change-Id: I70c0f6e119344358ef460c994adc6189d396400b