[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 87c98df7c5 -s ours am: 387e64ea11 -s ours am skip reason: Merged-In I066d2178a760aedc4f2dc2fcd2c048abb72488f1 with SHA-1 8d9665524a is already in history Original change: https://android-review.googlesource.com/c/platform/packages/wallpapers/LivePicker/+/3257938 Change-Id: If819c093dd9afb422ee597046102fc732549ce6f Signed-off-by: Automerger Merge Worker <[email protected]>