Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService""