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

Merge "Use less clusters for color extraction for small bitmaps" into udc-dev am: 8452c883 am: 485ec1e6

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



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