[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 18d0483a66 -s ours am: 53ed1a05b9 -s ours

am skip reason: Merged-In Ibd57bdd8defb1b60844194ec82c72060a3026710 with SHA-1 1911566607 is already in history

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

Change-Id: Id6aab32380ccd7658fd881b889a313d72317bf56