Merge "mtpd: Run with NET_ADMIN."
am: e5c6073727

Change-Id: Id142da9c2a226cb28ccb933cf884eef1dd23ae62