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

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



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