[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 890f20c9de -s ours

am skip reason: Merged-In I3a91fa581e5b3509d21a86200243e2d51c8b0953 with SHA-1 20b87a24a5 is already in history

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

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