Merge "Accounting for image scaling when calculating color extraction" into...

Merge "Accounting for image scaling when calculating color extraction" into sc-v2-dev am: f7f94174

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

Change-Id: Ic92d485b2fca34e2594405c092436e48deafbfd3