Merge "Merge "Fix ResolverDrawerLayout child measurement" into tm-dev am:...

Merge "Merge "Fix ResolverDrawerLayout child measurement" into tm-dev am: a834a9bd" into tm-d1-dev am: 487cabc5 am: 4fdd4ef2 am: b0da3cf7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625112



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