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

Merge "Accounting for image scaling when calculating color extraction" into sc-qpr1-dev am: 64b885a4 am: 699dcf20 am: 4e011915

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

Change-Id: I7c112b6f6990352552451ee718774866587940cb