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

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



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