[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 4113bf12d0
am: 1dfb8c8644
-s ours am: 70c298e9cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226 Change-Id: I2997c4c1ca545bd9acad7a552f384551f3d50eac
This commit is contained in: