Revert the changes to test/2246-trace-stream am: 3c0cc68d45 am: 0777677f41

Original change: https://android-review.googlesource.com/c/platform/art/+/2375893

Change-Id: I8ac70caf76e52baecbdfc5e082d98434f363e790
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>