Merge "Fix small buttons in collapsed layout" into tm-qpr-dev am: 5ff4c03f am: 6982e2fa

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



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