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

[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b8241875 am: 4113bf12 am: 1dfb8c86 -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: Ie675ec09705d7a010ab6abb114f40c037efac10e