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

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

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