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

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

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