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: e921fc5c am: bb60fe27

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



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