Merge "Fix BstatsCpuTimesValidationTest.testCpuFreqTimes_trackingDisabled" into sc-dev am: f7aca0513d

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

Change-Id: I17152579b09df7568ae3c9df78974a0623ac001b