Merge "Add display sleep token information to winscope dump." into sc-v2-dev am: 0f6684e3

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

Change-Id: I2948ef95448289c49c5471abd5732024e5278e7c