Merge "Fix bouncer always being on the left side" into udc-qpr-dev am: a8bf032c am: dd6f4be1

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



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