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

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



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