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

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

Change-Id: I87724b754527924dbc405cec7b6e4404e281e4eb