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

Change-Id: I44fe5b45c8cdc3d4ddd7edc210641f3883265c58