[automerger skipped] Merge "Suez: change display wake reason to push atom" into rvc-dev am: 5692bbb6 am: 8e18ba51 am: a8464d93 am: 3312e2cc -s ours

am skip reason: Change-Id I93cb9d5d835f139f327f27340d76c78d20e4bceb with SHA-1 cbc5070f is in history

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

Change-Id: I5a837e6026308bf345eeffb9e3aa6ad85f8f2153