Merge "mtpd: Run with NET_ADMIN." am: e5c6073727 am: dfc7f34c62
am: 953eb18d01

Change-Id: Ice87ce790d5b02b3e34309430cf2a11743f0e123