Merge "Merge "Fix ResolverDrawerLayout child measurement" into tm-dev am: a834a9bd52" into tm-d1-dev am: 487cabc548
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18625112 Change-Id: I01172f130cd70ea3b7f4176c46666e62278380fc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: