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

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

Change-Id: I9172e1b5536f5089a24205cf2367d8438642b19f