[automerger skipped] Merge "Selectively expect device to stay awake on fold"...

[automerger skipped] Merge "Selectively expect device to stay awake on fold" into 24D1-dev am: 9acf675d -s ours

am skip reason: Merged-In I2845ffd73102d664eac226042318ad16f75efce6 with SHA-1 1343e6cb is already in history

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



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