Merge "Inset the bubble bar expanded view instead of drawing our own header"...

Merge "Inset the bubble bar expanded view instead of drawing our own header" into udc-qpr-dev am: bd2caf6a

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



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