[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism...

[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b8241875 am: 68173c13 am: 0f87cd00 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226

Change-Id: Ie37a13a666fae4f956ab447204fd06edc6146538