[automerger skipped] Merge "Add uid state information to trace event" into main am: 0b622da3 am: 80fc6a19 -s ours

am skip reason: Merged-In I416c5bf65a5a5570bb2ae6ea6272ba31f3dd14bb with SHA-1 f8833816 is already in history

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



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