Merge branch 'upstream/main' into master

Change-Id: I37bfde130b9e2420ce0bc87059fd94d48caa995d
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/frameworks/proto_logging/+/5779709
Reviewed-by: Archie Pusaka <apusaka@chromium.org>
Auto-Submit: Hsin-chen Chuang <chharry@google.com>
Tested-by: Hsin-chen Chuang <chharry@google.com>
Commit-Queue: Archie Pusaka <apusaka@chromium.org>
tree: 83a8e7479d273234c34a6600ac33f05099f9f7d4
  1. stats/
  2. DIR_METADATA
  3. OWNERS