resolve merge conflicts of 72fa0d4 to nyc-dev-plus-aosp
am: 0e3d273

* commit '0e3d2736706df85349522c6969db10e9b72b796a':
  When the applicantion is removed, reset network permission of this uid.

Change-Id: Iec2b7360714c8948ecaecebc59d4a17d2c904c24