Merge "Remove PackageManagerInternal from AppSearchService." into sc-dev