Merge changes I576a8fe5,Ib8ed481e

* changes:
  Don't touch NetworkSecurityPolicy in ActivityThread
  Don't depend directly on AppplicationInfo