Merge "Fixes lives wallpaper preview and colors not updating after setting"...

Merge "Fixes lives wallpaper preview and colors not updating after setting" into udc-dev am: 8e1a7a94 am: 48638f85 am: d8c059cc

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



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