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

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

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