[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to AOSP main am: 0460df93c6 am: 18a50f1218 -s ours

am skip reason: Merged-In Ic3bd4f03ed6e4cb5eb0fdddc545610982adaa1f5 with SHA-1 85629e238e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/SettingsIntelligence/+/31417779

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