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

[automerger skipped] Merge "[DO NOT MERGE] Pre-allocate height for contextual cards." into rvc-d1-dev am: 8c3987b9 am: 4d6f8bf3 am: 09b5db82 -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: I390cd9424e39426f7022968f716e1d37e5f80f49