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

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

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