[automerger skipped] Merge "Revert "Revert "Fix Expandable.kt to work with new...

[automerger skipped] Merge "Revert "Revert "Fix Expandable.kt to work with new Compose prebu..."" into aosp-main-future am: 385d811e -s ours

am skip reason: Merged-In I73e2cb8ba30b6506280daba9675b81ff9ff9c611 with SHA-1 542ebe7a is already in history

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



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