am 2c5674aa: Merge "Avoid NDC deadlock when re-arming network alert."

* commit '2c5674aa7ba006a712cf885be1657f754f2dee96':
  Avoid NDC deadlock when re-arming network alert.