[automerger skipped] Merge "Merge "Calculate all apps cell height based on...

[automerger skipped] Merge "Merge "Calculate all apps cell height based on actual sizes." into rvc-dev am: 8127f132 am: d5b15bb0" into rvc-d1-dev-plus-aosp am: befa44ac -s ours am: 4ecf494f -s ours

am skip reason: Change-Id I3d85adec3e7e3652fe4a258bd659382a3e696211 with SHA-1 f06e1b8b is in history

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

Change-Id: Ia6b4e6d4442b61f49266ea1330ff50b94acc5459