Merge "Try to load colors more frequently" into tm-dev am: af8e6e4e

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



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