Merge "Remove flakyness in BugreportManagerServiceImplTest." into main