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

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



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