Merge "Merge cherrypicks of ['android-review.googlesource.com/2547070'] into androidx-mediarouter-release." into androidx-mediarouter-release