Merge "1/2 Making bouncer shift on double tap when user chooser is visible"...

Merge "1/2 Making bouncer shift on double tap when user chooser is visible" into tm-qpr-dev am: 3a98dbf9

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



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