Merge "ResolverDrawerLayout: unify mCollapsibleHeight calculation." into tm-qpr-dev am: c317e6a26b am: 1f867aa7af

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/20582588

Change-Id: I5a0611b20ea18657d08301d8375a51549cd5f74b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>