Merge "Do not request WAKE transition when device wake up." into tm-qpr-dev am: 4d01e66b93 am: fd7d2446a4

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

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