Merge "Merge "Don't immediately hide bouncer on LS swipe up" into sc-dev am:...

Merge "Merge "Don't immediately hide bouncer on LS swipe up" into sc-dev am: eb872591 am: 29c07ea9" into sc-v2-dev-plus-aosp am: f2ee9586

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

Change-Id: Ie431e1a838d02b53c3743a66d8dd9e33a61c61d4