Merge "STT: Add encoding option to read trace files" am: 3414060631

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

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