Merge "init: allow mediaserver to tag socket (group net_bw_acct)"