[automerger skipped] Merge Android 12 am: ae6e2a3ef9 -s ours am: 7d074f6dbe -s ours am: 9096c04332 -s ours

am skip reason: Merged-In Ifea01915497482aeee896bdc7972a717397635ae with SHA-1 d52bd01eb7 is already in history

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

Change-Id: Id3319b9de25eb77ca17840cdd14160f17b29a395