Merge "Restructure tracing code to prepare for the adding of filtering and...

Merge "Restructure tracing code to prepare for the adding of filtering and searching features." into sc-dev am: 0f4986c2

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

Change-Id: Ic12226e5782da0aaced5c36e7b04f4620a9011fc