Merge "Improve TrafficStats UID APIs."