Merge "Add a view type check to ensure the right animation is used." into udc-dev am: 07c3491ec2 am: 1de059dbeb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22433062

Change-Id: I7cca0f7a47cd265137f0006b76fee37eedac861a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>