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

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



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