Merge "[conflict] Merge "Re-revert "Move wallpaper local color extraction to...

Merge "[conflict] Merge "Re-revert "Move wallpaper local color extraction to background"" into tm-qpr-dev am: 24ec3157 am: f2b3028b" into udc-dev am: 88afe5e2 am: 0e78856b

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



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