[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 4113bf12d0
am: 1dfb8c8644
-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
This commit is contained in: