Merge "Add getCpuMeasuredBatteryConsumptionUC to FakeUid" into sc-dev