Merge "[DO NOT MERGE] Update contextual cards display mechanism" into rvc-d1-dev am: 51f80cb3 am: ec053834

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

Change-Id: I45f3140b7b3beba80536ca9779c33479a29b6a7d