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

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



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