[automerger skipped] Merge Android 12L am: 3fd907d1b3 -s ours am: 06d476ef6d -s ours am: a4d502557d -s ours

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

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

Change-Id: Ic56509f8e602d2001b17aa3d1d18a44711d83a6c