Merge "Revert "Avoid vsync enabled when in DOZE mode (AOD)."" into tm-dev am:...

Merge "Revert "Avoid vsync enabled when in DOZE mode (AOD)."" into tm-dev am: b337e18d am: 033e50af am: 26df5d9e

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17867958



Change-Id: Ieeab91fc5cc33f13d8e301c41d4ce9b2d02428cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>