[automerger skipped] Merge "Update shade transition on full expand or...

[automerger skipped] Merge "Update shade transition on full expand or collapse" into 24D1-dev am: 6a9f4051 -s ours

am skip reason: Merged-In I5c310ab038603c33f0a6a202ebcee9110e0612d9 with SHA-1 5f17e34c is already in history

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



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