Merge "Snap for 6820526 from 0dd0bcb5eefdcb7cd75fc30db2d75467fdfacef0 to androidx-mediarouter-release" into androidx-mediarouter-release