Merge "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main" into main am: 2663cf0a41

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

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