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: 1e6c00c8

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

Change-Id: Ib663b36bccf825b72419495322d063be47c2a57c