Merge "Made usages of animate().setListener() call safer" into sc-v2-dev am: fdbed18c79

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

Change-Id: I70ceeb293b6856bf96f35875898b2f149e0a94b5