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

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

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



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