Merge "Accounting for image scaling when calculating color extraction" into sc-qpr1-dev am: 64b885a4 am: a8c0d68b

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

Change-Id: I1f645c287485d0af31e706215e010fe9a6f39d71