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

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

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