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

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

Change-Id: Ifdbfca47ba029a56015062c8ff7cd54282d2c070