Merge "Opt hwui_unit_tests (and benchmarks) out of test runner sharding" am:...

Merge "Opt hwui_unit_tests (and benchmarks) out of test runner sharding" am: 3ee6d595 am: b8889b6e

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



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