Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: cd534c6990
am: 8caa274ade

Change-Id: I2f27c76a1f493ff4f0bd423c06f159e629866d4d