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

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



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