Merge "Revert to using nano protos for shell side tracing" into udc-dev am:...

Merge "Revert to using nano protos for shell side tracing" into udc-dev am: 9c5f0245 am: 2f3403a6 am: adc15f5b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22938207



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