[automerger skipped] Merge 10952656 am: 67163cb8e6 -s ours am: bee5908bf7 -s ours

am skip reason: Merged-In I344b7cbac84a22eabbf2174b55ccdb470efa8537 with SHA-1 cea41d0876 is already in history

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

Change-Id: Ia50c9b9c59a098080b0808bafc55b92e603e6cb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>