Merge "Merge "[Bouncer] Reset y translation and alpha" into tm-dev am:...

Merge "Merge "[Bouncer] Reset y translation and alpha" into tm-dev am: 9ebf6999 am: ab3a01c9 am: 346d921c" into tm-qpr-dev-plus-aosp am: 7a4daa2a

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



Change-Id: I533794dd4f21a7687c36dba09184e6bc22db19f8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>