[automerger skipped] Reconcile Expandable.kt on master/tm-qpr-dev-plus-aosp...

[automerger skipped] Reconcile Expandable.kt on master/tm-qpr-dev-plus-aosp and tm-qpr-dev am: c14e8fec -s ours am: 7817e07e -s ours

am skip reason: Merged-In I97660c5a9a2758c5e19d037e635c21456b6085c3 with SHA-1 a13520b4 is already in history

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



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