Merge "Additional libcore benchmarks." am: e81851f57b am: e981334c62 am: 17c5bf6107

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

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