Merge "Workaround for doze/AOD problem with global wakefulness" into tm-qpr-dev am: 05857f60

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



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