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

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



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