Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev