[automerger skipped] [DO NOT MERGE] Update contextual cards display mechanism am: b824187524
am: 68173c1343
am: 0f87cd00a1
-s ours am: ac76b763fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343226 Change-Id: I7afeb0ef7eea928cf14a56ee714e121c970bfbdc
This commit is contained in: