Merge "Fix the spacing between bubble bar and expanded view" into udc-qpr-dev...

Merge "Fix the spacing between bubble bar and expanded view" into udc-qpr-dev am: 21d1cb3d am: c999d4bf

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



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