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

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

Change-Id: Ie0743a33b49555226b637ae16d592403f6108b8a