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: fc63282f am: 4acc92c3 am: 9586aecc

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



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