Merge "Stop clatd when starting the Nat464Xlat service." am: 0e4a21806a

Original change: undetermined

Change-Id: I3fd26abfa9b8671d25a6a378120c181b1f7ccb81