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: 485ec1e6" into udc-d1-dev-plus-aosp am: 00e5b0cd

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



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