Merge "Added color light/dark theme for lotties" into tm-qpr-dev am: 17b52d7600 am: d1633d97c9

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

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