[automerger skipped] Merge "CPU time min threshold for CpuTimePerUidFreq" into...

[automerger skipped] Merge "CPU time min threshold for CpuTimePerUidFreq" into rvc-qpr-dev am: cc3ff5cd am: 8a0d6e46 -s ours

am skip reason: Change-Id Ia7f2a2ad71831387cffdd6db30da4ce501219d0e with SHA-1 a79cf88c is in history

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

Change-Id: I54db521c6f42ab8f96714a84113f2223b12c6e41