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

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



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