Merge "[Bouncer] Only show swipe up and try again..." into tm-qpr-dev am: e0929fa9 am: aa12d42a

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



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