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 am: 87ff243e

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



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