Merge "Revert "Revert "Fix Expandable.kt to work with new Compose prebu...""...

Merge "Revert "Revert "Fix Expandable.kt to work with new Compose prebu..."" into udc-dev-plus-aosp am: 550e3e62 am: db06c370 am: c37974b3

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



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