Merge "Annotate test in MediaProjectionManagerServiceTest as flaky" into udc-qpr-dev