Merge "Preserve Composable state when expanding it" into tm-qpr-dev am: 75383262

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



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