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

Bug: 262222023
Test: Builds
Change-Id: I97660c5a9a2758c5e19d037e635c21456b6085c3
Merged-In: I97660c5a9a2758c5e19d037e635c21456b6085c3
2 files changed