Merge "Setup button bar padding before empty state handling" into rvc-dev am:...

Merge "Setup button bar padding before empty state handling" into rvc-dev am: 16fce9c6 am: 8b600257

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

Change-Id: Id3f7f65ecdf3518181714103453f33ffb598edab