Merge branch 'upstream/main' into master

Change-Id: I6e1dfae7d6a72135466e041071b19cdc7d150272
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/frameworks/proto_logging/+/5751921
Auto-Submit: Hsin-chen Chuang <chharry@google.com>
Commit-Queue: Hsin-chen Chuang <chharry@google.com>
Tested-by: Hsin-chen Chuang <chharry@google.com>
Reviewed-by: Ying Hsu <yinghsu@chromium.org>
tree: 52e4405ec8cf6cfa3ee6e0371203941a784fdf8d
  1. stats/
  2. DIR_METADATA
  3. OWNERS