Merge "Protect mtpd socket from VPN" am: de148c40d2
am: e80d1cfd58

Change-Id: I9648e9b3caee84267ae30d86fc99cf7c5ed5c1b5