Merge "AOD: avoid flicker when turning off screen" into oc-dr1-dev
am: b4fe9ce703

Change-Id: Iedeab3f2342729224fe79f17665ef6e9f2a65f76