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

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

Change-Id: Ie2af3e4935a1faae93a10c1315adebc9ccf33dfe