Merge "Frameworks/base: Some cleanup in PackageManagerService"