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: I1a8c5449b6f2806d55bd029b613174f29c6d9e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>