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 am: 1333639b

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



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