Merge "Add uid state information to trace event" into main am: 0b622da3

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



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