Merge "Prevent leaked receivers from MediaOutputDialogTest" into udc-dev