Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev