[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 977b6bf04c -s ours

am skip reason: Merged-In I823dd90fc4712676e1a497a98ffb98605d3f73e5 with SHA-1 3235eb4029 is already in history

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

Change-Id: I83ec882df031db454ffc29c3cbba68dbb7042f39