[automerger skipped] Merge "Merge "Keep contextual card dismissal info upon...

[automerger skipped] Merge "Merge "Keep contextual card dismissal info upon deletion" into rvc-dev am: 520cb585 am: 33b626bd am: daaa66f8" into rvc-qpr-dev-plus-aosp am: 8d782dbc -s ours
am skip reason: Change-Id I9d095955e9c51f2aa3332d49ee230d3ded9ae744 with SHA-1 5f8a0849 is in history

Change-Id: I2168ccf6aa5a87508e88e0665a97a7edddefcadc