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: ef7721d3

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



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