Merge "Fix bouncer to launcher/app animation" into sc-dev am: 6057f676 am:...

Merge "Fix bouncer to launcher/app animation" into sc-dev am: 6057f676 am: aa845264 am: 8137ee2b

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

Change-Id: Iaf59803849d98c930136ed5703b37cafd490281f