Merge "Merge "network: Adds the functionality to parse uid in netlink messages." into nyc-dev am: 2512ec9e37 am: f9f10cbe36" into nyc-mr1-dev-plus-aosp