Merge changes from topics "expandable-border", "expandable-interactive-size"...

Merge changes from topics "expandable-border", "expandable-interactive-size" into tm-qpr-dev am: 2ea53262

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



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