Merge "Stop including systrace in platform tools" am: 03f2a0c5e6

Original change: https://android-review.googlesource.com/c/platform/development/+/1914938

Change-Id: Ie59d12408078f001dede43661bb1c67712a5b7a6