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

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



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