Merge "Remove old benchmark tests" into udc-qpr-dev am: 2ffc95a2

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



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