Merge "Add _default to the normal benchmark names." into main am: c6c3e0ba66 am: 556dd41f05 am: e7dc23cbd8 am: 2f425943bc

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2784714

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