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 am: 47a0b18c

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

Change-Id: Ib66ea73068a0fe45fcf634fed3e9dee91c03957b