[automerger skipped] AiCore reattribute feature am: f8b46c01e8 -s ours

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

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

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