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

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

Change-Id: I27ede8f4d92941c847bd2f58c562b57487961dd0