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

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



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