Merge "Merge "Use less clusters for color extraction for small bitmaps" into...

Merge "Merge "Use less clusters for color extraction for small bitmaps" into udc-dev am: 8452c883 am: e921fc5c am: bb60fe27" into udc-qpr-dev-plus-aosp am: a27b8a27

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



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