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 am: 7ebe3b34

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



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