Merge "Fix downgrade wallpaper restore bug" into 24D1-dev am: 0753af02fc

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

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