[automerger skipped] Merge "Add display sleep token information to winscope...

[automerger skipped] Merge "Add display sleep token information to winscope dump." into sc-v2-dev am: 0f6684e3 am: c34b3262 -s ours

am skip reason: Merged-In Ia25854feed3bb6b037d4510a6b5000d906d27313 with SHA-1 97f9372e is already in history

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

Change-Id: Ice60a75b02ac67a7a7faefc3c7784048b44c0c9f