Merge "Merge "Revert "Nat464Xlat: interface notification handler on ConnectivityService"" am: 1d66352b40 am: 4c1b0ae343 am: de68a0a1af" into oc-mr1-dev-plus-aosp