Merge "Change parameterization type in libcore benchmarks." am: 11915f3675

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

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