[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 86a0d86096 -s ours am: 4792aa54c6 -s ours

am skip reason: Merged-In I92f8d172e451976980c3cacc2de5597735b83e53 with SHA-1 dfbc40fef6 is already in history

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

Change-Id: Icfbb315efdafe32b49ab7bd54a4d51ca88ea627a