Merge "Preserve Composable state when expanding it" into tm-qpr-dev am: 7538326223 am: 9ec0b786bc

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

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