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 am: 5a31d5b0

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



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