Merge "Ignore isolated uid's process state in BatteryStats tracking" into...
Merge "Ignore isolated uid's process state in BatteryStats tracking" into oc-dr1-dev am: 5a800cf0 am: 6aaaa2bb
am: c1183bf2
Change-Id: I0a0df13efa74f3277bf907dcc76ccda3d2ead275