Merge "Correct behaviour of update function to handle multiple wallpapers"...

Merge "Correct behaviour of update function to handle multiple wallpapers" into udc-qpr-dev am: 16434906

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



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