[automerger skipped] [DO NOT MERGE] Pre-allocate height for contextual cards....

[automerger skipped] [DO NOT MERGE] Pre-allocate height for contextual cards. am: 228bc78b am: c248da29 am: f9b6dd0f -s ours

am skip reason: subject contains skip directive

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

Change-Id: I7af9b8050d0081fc823d4c80568181735f75f4aa