tree c98a47e3fb6d89e935dd73859206ec9e784bcd8c
parent 501c6a123e1aa0df849531df4b45d4e553f201e2
parent 4ef2e530790479a12338e121dd84ea479455e6b9
author Xin Li <delphij@google.com> 1725679613 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725679613 +0000

[automerger skipped] Merge 24Q3 to AOSP main am: f2759be957 -s ours am: 4ef2e53079 -s ours

am skip reason: Merged-In I92cce5f51a6d2463731ac5817e39a3934d538a52 with SHA-1 cc232d0c52 is already in history

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

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