[automerger skipped] Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb585 am: 7ed2795d" into rvc-d1-dev-plus-aosp am: e1763f51 -s ours
am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 5f8a0849 is in history

Change-Id: Ie6ff61d44fc3cc8a0b092fbd72fd4bef49c3bcc7