[automerger skipped] Merge "Combine uids for CpuTimePerUidFreq atom" into...

[automerger skipped] Merge "Combine uids for CpuTimePerUidFreq atom" into rvc-qpr-dev am: 9622b6d7 am: 946b5ee7 -s ours

am skip reason: Change-Id I0d9a18c78f456e1b0f9d7ad322f15354ead9f02b with SHA-1 e69ade35 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f328d6a0e186ea5e4b3dc5bd4a8ad812ee8d546