Merge "HW Vsync turns off correctly in Doze/AOD." into tm-qpr-dev am: 91dc9f36

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



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