Merge "Fix incorrect action icons" into udc-qpr-dev am: f4a9984066

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

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