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

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

Change-Id: Id6b9042fe823441588be96689692fe47fbbde049