[automerger skipped] Merge Android 12L am: 3fd907d1 -s ours am: 06d476ef...

[automerger skipped] Merge Android 12L am: 3fd907d1 -s ours am: 06d476ef -s ours am: a4d50255 -s ours am: d2f98823 -s ours am: fb982cdd -s ours

am skip reason: Merged-In I504cece275a216e5e849969cdb4d9502ca184593 with SHA-1 86a0d860 is already in history

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

Change-Id: I5e875514736df814aa4063ae836ca26e838ca2a9