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

Revert submission 23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ

Reason for revert: <b/281883862 is fixed >

Reverted changes: /q/submissionid:23149513-revert-22208109-lifecycle_9778738-CXBRVAFFSZ
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:86038cfead9f13ba40aace016f6f58ccaabc91ad)
Merged-In: I73e2cb8ba30b6506280daba9675b81ff9ff9c611
Change-Id: I73e2cb8ba30b6506280daba9675b81ff9ff9c611
1 file changed