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

Change-Id: I3bcd7c6cb530a00927525740503763ad78a3b5fd