[conflict] Merge "Add atoms to track cold/warm process start per action type" into tm-dev am: 6fa139d2b5

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

Change-Id: Ibbda145602d347c7374af20abbfc7ca79de5bcde
Merged-In: I19f4c9efd414add171ae98cccae36319b0c9c926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
tree: 8233dc6fc379ce18d94ef10b84ba97467e3e456e
  1. stats/
  2. OWNERS