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

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



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