Merge "Fix an issue where swiping up on the bubble bar would take you home"...

Merge "Fix an issue where swiping up on the bubble bar would take you home" into udc-qpr-dev am: 89d08215

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



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