Merge "Fix-up starting style&wallpaper from search" into main am: c37f89dff9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2974798

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