Merge "Update power manager to track uid state like netstats." into mnc-dev