Merge branch 'upstream/main' into master

Change-Id: I90fb2e4bbb47a0a80e2ced0ad8474f98f22ade6c
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/frameworks/proto_logging/+/5528438
Tested-by: Hsin-chen Chuang <chharry@google.com>
Reviewed-by: Katherine Lai <laikatherine@chromium.org>
Commit-Queue: Abhishek Pandit-Subedi <abhishekpandit@google.com>
Auto-Submit: Hsin-chen Chuang <chharry@google.com>
Tested-by: Katherine Lai <laikatherine@chromium.org>
Reviewed-by: Abhishek Pandit-Subedi <abhishekpandit@google.com>
Reviewed-by: Ying Hsu <yinghsu@chromium.org>
tree: 1b41aae0298bb0200a38936a5cffd060b3ac04fe
  1. stats/
  2. DIR_METADATA
  3. OWNERS