[automerger skipped] Merge Android U (ab/10368041) am: 515d4f6193 -s ours am: d1bba337a6 -s ours am: cba4d01275 -s ours

am skip reason: Merged-In I83d433bb2235e3181a1a0dad1d95647bad2226b3 with SHA-1 829ee323b4 is already in history

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

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