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

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



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