Merge "Do not animate icons in tiles that shouldn't" into tm-qpr-dev am: c164c02c am: ef36eb32

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



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