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

Change-Id: I73e2cb8ba30b6506280daba9675b81ff9ff9c611
Merged-In: I73e2cb8ba30b6506280daba9675b81ff9ff9c611
(cherry picked from commit 86038cfe)
(cherry picked from commit 08a077d6)
(cherry picked from commit 542ebe7a)