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

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



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