[automerger skipped] Merge "Add additional PowerManager wakeup reasons" into...

[automerger skipped] Merge "Add additional PowerManager wakeup reasons" into tm-qpr-dev am: 0de1e474 am: 7ce8e809 -s ours

am skip reason: Merged-In I2b445e545427bd3411ac1f3b33359d51b1bdbad0 with SHA-1 5ba2a9b2 is already in history

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



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