Merge "Make MediaRoute2Info#getOriginalId() as @TestApi"