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

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



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