Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am: 1d66352b40
am: 4c1b0ae343

Change-Id: Ibb3a382ad45a708c63a3d7f4d3be0bf54881403a