Merge "Bubble bar dismiss" into udc-qpr-dev am: 6055613ef5 am: 78adc3bce1

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

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