Merge "Don't use Parameterized runner in StringBuilderPerfTest" am: 31392b91a6 am: 1b399c72df am: 92b41f9d0e

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

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