Merge changes from topic "b/262254794" into tm-dev

* changes:
  Cleanup after test suite split.
  Moving PackageManagerServiceTests to their own suite.