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

Change-Id: Idac7b125d40dfd43b51d04070f92b4f754399c4a