Merge "Add new attribute to support lottie dynamic color" into tm-qpr-dev am: e02788c4c8 am: c72d15dff8

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

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