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 am: a130f82c

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



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