Merge "Merge "Remove cts tests for validating uid times per cpu freq in dump." into oc-dev am: 3573dc7108 am: e35ddc1b27" into oc-dr1-dev-plus-aosp