Merge "Revert "Annotate state changes on traces"" into sc-v2-dev am: fb12892a

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

Change-Id: I501103e87d769ba89b3507ba53c27312b5639284