[automerger skipped] Merge 10952656 am: 4e9139fd3d -s ours am: 473d005064 -s ours

am skip reason: Merged-In I38da1343501d27516ec73bedc0bec2f1588c2073 with SHA-1 575d9ed545 is already in history

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

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