Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf069
am: 6aaaa2bbb0

Change-Id: I350fe683266ba2a139043c16d282a27b558a625e