Merge "Change perf-setup.sh to perf-setup in run.sh" am: 5d1eaf9cee

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

Change-Id: I207631383b632efdf8f333d37901c5c88afa7a96