[automerger skipped] Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb5851c am: 7ed2795dc7" into rvc-d1-dev-plus-aosp am: e1763f51db -s ours am: b9e2881321 -s ours
am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 5f8a084909 is in history
Change-Id: If4e7c3ebaf64b8512ad5f05cf2133fa055322a98
This commit is contained in: