[automerger skipped] Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future am: c5fd9e5f3c -s ours

am skip reason: Merged-In I1ef46e98629c9aa7ea364e83153b55779e7486ea with SHA-1 edf59235bc is already in history

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

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