Merge "Add wallpaper to sync set during collection" into udc-qpr-dev am: 5f2babc0

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



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