Merge "Remove flakyness in BugreportManagerServiceImplTest." into udc-qpr-dev