Merge "[Bouncer] Fix vertical spacing between buttons." into tm-qpr-dev am: 252018cf

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



Change-Id: I1ab6a7bb065d002f8f7855cafde2a4a17ced1812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>