[automerger skipped] Merge "add uid in WifiP2pConnection event" into tm-mainline-prod am: c579d78ab3 -s ours

am skip reason: Merged-In I4be966cbe85bebc5bc7a55a53550ce74f56451f0 with SHA-1 3a0b04bea9 is already in history

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

Change-Id: I0abd4d9bf4b6c47ca2bd93630c37c0d04379d456
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: f1a4b1aed9fb0799be0cdb94c3719561974d195c
  1. stats/
  2. OWNERS