[automerger skipped] Merge "AiCore reattribute feature" into 24D1-dev am: c7de1ca1 -s ours

am skip reason: Merged-In Icc9a475a71f189e72bf06f9a0b4c23380a90a603 with SHA-1 29f73d68 is already in history

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



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