Merge "Fix not animating icons" into tm-qpr-dev am: 887d4bb67f am: 23b6eea596

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

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