Merge "Combine uids for CpuTimePerUidFreq atom" into rvc-qpr-dev am: 9622b6d7d0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id450db7d6874e2e1f4832b8dc0c40f972d62bf18