Merge "Do not overwrite user set or live wallpapers" into main am: 3ff587dd76

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

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