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 am: e10e5a09 am: 99744ef8 am: a9fdb6ae

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



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