Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069 am: 26f8f5c868
am: 7d00772ceb

Change-Id: Ib23376b9f072522167c02ea009a0284ab5eabccb