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: e42a9e31 am: 3c5d6c4e am: 89dd1b33

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

Change-Id: Ifa6969ba7f0855c1f5287a704e58f8362318972f