Merge "Fix the AppIntegrityManagerServiceImplTest." into rvc-dev