Merge "Mark both stage ids as uids now that it is supported" into sc-v2-dev am: 2beade73b7 am: 069ce48509

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

Change-Id: I9f4cde4bb210f15a0ff62bd431d18f38b54944d4
tree: dfd28e44f5be2a9c2332f01aaeb591a268f215ce
  1. stats/
  2. OWNERS