Merge "Replace PackageManagerWrapper with PackageManager"