Merge "Fix the spacing above the bouncer message." into udc-qpr-dev am: 14f986e1

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



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