Merge "Update local wallpaper colors when areas added and fix stale clock" into sc-v2-dev am: b9902adf15

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

Change-Id: I7fe2ebb469ae36a6fa6be37b83629029418bd80e