Merge "Don't try to sync wallpapers" into tm-qpr-dev am: bae4b41c am: ae63d610

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



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