Merge "simpleperf: update test apk to run on wear devices." am: fa1c8b0b16 am: 97854f9552

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

Change-Id: I768343c7f24c42bbf67e1be2985b8385ffe5c758