Merge "Fix BP did not dismiss after swiping up the notification bar" into udc-dev am: 209bc17b27

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

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