Merge "Remove FrameworkShadowPackageManager"