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

Change-Id: Idf75f2b3c9c3468e1970ba59eb117cc60c784599