[automerger skipped] Merge "Change parameterization type in libcore benchmarks." am: 11915f36 am: 121f0b4a am: cbb61ce5 -s ours

am skip reason: Merged-In I3ac0f368807775f264264947ab913546fc81dbd5 with SHA-1 8c57a1e2 is already in history

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



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