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

[automerger skipped] Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3 am: f07366ff am: 68e80545 -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: I2f7c4737d930fea7a800b79ce10b65c8c477be61