Merge "Snap for 5633604 from d5d86264194d9191961ee0e90680efa7d9829961 to androidx-mediarouter-release" into androidx-mediarouter-release