Merge "Merge "Setup button bar padding before empty state handling" into...

Merge "Merge "Setup button bar padding before empty state handling" into rvc-dev am: 16fce9c6 am: 8b600257 am: 47a0b18c" into rvc-qpr-dev-plus-aosp am: 78232c70

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

Change-Id: I81f4d29da5e383d139fc2944c4c03768f0c0eacc