Merge "Make TrafficStats uid attribution @SystemApi" into lmp-dev