[automerger skipped] Merge "Don't return half folded state when display in...

[automerger skipped] Merge "Don't return half folded state when display in transition" into 24D1-dev am: 1656b433 -s ours

am skip reason: Merged-In Iefaf6e2422e9c38fff7c3a931d94e94061bb5dd2 with SHA-1 08f79506 is already in history

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



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