Merge "Fix a broken test by mocking PackageManager"