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-qpr-dev am: e7e7d9d3

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



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