Merge "Reconcile Expandable.kt on master/tm-qpr-dev-plus-aosp and tm-qpr-dev"...

Merge "Reconcile Expandable.kt on master/tm-qpr-dev-plus-aosp and tm-qpr-dev" into tm-qpr-dev-plus-aosp am: a9fa09cb

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



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