[automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b907
am: f046aa5beb
am: ecf25c02f0
-s ours am: 297fc4b9f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343231 Change-Id: I050a8ec41f88ae4f3621004558515202240b2a26
This commit is contained in: