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 am: f58b5f61

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



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