Merge "Fix BstatsCpuTimesValidationTest.testCpuFreqTimes_trackingDisabled" into sc-dev am: f7aca051 am: 7e3a4dc3

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

Change-Id: Ie3c698e2c4f9ee6e9eacf5e636df7f8276318358