[automerger skipped] Merge "DO NOT MERGE change the NotificationCompat to Notification to enable showing app icon in the notification." into qt-car-dev am: 36237cfce2 -s ours am: c46446664c am: 34f6bc8efa am: 9e650aa5f1 am: bdc453dd27 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8c609d070298f1d7a7256bebd052c2ee8824c3a4