[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: f046aa5b am: ecf25c02 -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: I2b7e845d99bd0e46d124d1d9508ca5aaded8002e