[automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" into...

[automerger skipped] Merge "Migrate to frameworks/proto_logging/stats" into stage-aosp-master am: 9218917e -s ours am: 53038e17 -s ours

am skip reason: Change-Id I30180ec8e75f6c619dbe8492e74324d2e38d6a3f with SHA-1 4e1fe29c is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f4833a179d69784faf4c04a7b42ffe5e04b7637