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

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

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